Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Faction datums for smarter faction logic #3156

Merged
merged 20 commits into from
Sep 10, 2024

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented Jun 26, 2024

About The Pull Request

A basic datum system for managing factions, currently they are only used to consistently grab faction names!

Why It's Good For The Game

Simplify attaching content to factions.

Changelog

🆑
add: Added faction datums, this will be cool soon!
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. labels Jun 26, 2024
@github-actions github-actions bot requested a review from MarkSuckerberg June 26, 2024 17:14
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 17, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 1, 2024
Copy link
Contributor

github-actions bot commented Aug 1, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 10, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 25, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 30, 2024
@FalloutFalcon FalloutFalcon marked this pull request as ready for review August 30, 2024 15:06
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner August 30, 2024 15:06
@rye-rice rye-rice added this pull request to the merge queue Sep 10, 2024
Merged via the queue into shiptest-ss13:master with commit 6b3c4c8 Sep 10, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Sep 11, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
A basic datum system for managing factions, currently they are only used
to consistently grab faction names!

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Simplify attaching content to factions.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: Added faction datums, this will be cool soon!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
@FalloutFalcon FalloutFalcon deleted the faction-stuff branch September 16, 2024 21:55
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 24, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
A basic datum system for managing factions, currently they are only used
to consistently grab faction names!

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Simplify attaching content to factions.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: Added faction datums, this will be cool soon!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 24, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
A basic datum system for managing factions, currently they are only used
to consistently grab faction names!

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Simplify attaching content to factions.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: Added faction datums, this will be cool soon!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants